Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 11 Apr 2006 11:51:48 +0000 (12:51 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 11 Apr 2006 11:51:48 +0000 (12:51 +0100)

Trivial merge